Bump default timeout to 60s

Closes #1333

diff --git a/src/cargo/ops/registry.rs b/src/cargo/ops/registry.rs
index 7ef7fe354f827a691ab002b9c23930b6e2d02c6d..d72ed78fd9151ea6fdc27e13c4aef378aa726f36 100644 (file)
--- a/src/cargo/ops/registry.rs
+++ b/src/cargo/ops/registry.rs
@@ -161,7 +161,7 @@ pub fn registry(config: &Config,
 
 /// Create a new HTTP handle with appropriate global configuration for cargo.
 pub fn http_handle(config: &Config) -> CargoResult<http::Handle> {
-    let handle = http::handle();
+    let handle = http::handle().timeout(60);
     let handle = match try!(http_proxy(config)) {
         Some(proxy) => handle.proxy(proxy),
         None => handle,

diff --git a/src/doc/config.md b/src/doc/config.md
index 66a48789c7735fb8150ab4f264f18646e2c5030c..56913d878dc5de03427468fe08d122d406119d25 100644 (file)
--- a/src/doc/config.md
+++ b/src/doc/config.md
@@ -73,7 +73,7 @@ token = "..."   # Access token (found on the central repo's website)
 
 [http]
 proxy = "..."     # HTTP proxy to use for HTTP requests (defaults to none)
-timeout = 30000   # Timeout for each HTTP request, in milliseconds
+timeout = 60000   # Timeout for each HTTP request, in milliseconds
 
 [build]
 jobs = 1        # number of jobs to run by default (default to # cpus)